restructure converters #1825
restructure converters #1825
Conversation
each converter is its own keyboard and different hardware variants are different subprojects. remove (seemingly) old method of loading layouts from main Makefile
Makefile
Outdated
| # endif | ||
|
|
||
| # LAYOUT_KEYMAPS := | ||
| # $$(foreach LAYOUT,$$(KEYBOARD_LAYOUTS),$$(eval LAYOUT_KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/layouts/*/$$(LAYOUT)/*/.))))) |
There was a problem hiding this comment.
I haven't seen, known or used this method of loading layouts. I compiled all the keyboards with this commented out and got no errors, so I assume this is old and unused.
The reason why I removed it is because for my USB-USB converter, I need to include a makefile from the keyboard-rules.mk. The path of this makefile uses $(TMK_DIR), which is apparently not defined when the keyboard-rules.mk is first read in the above code segment. The next time that file is read, $(TMK_DIR) has been defined by common.mk and the build runs through fine.
If the removal of this segment is a problem, let me know and we can try to find another solution.
There was a problem hiding this comment.
This is new and being used - no errors were generated because commenting it out just ignore layouts/, effectively removing the feature ;)
There was a problem hiding this comment.
I have worked up a project for the KC60 SE. I think is made by the same company as KC60, NPKC. Do you have a good example of the new structure that you are implementing? My KC60SE project is at 'https://github.com/BlakeCLewis/kc60se'. I think that GH60, KC60, XD60 could all be subprojects. Though It loks like many of these keyboards have legacy code that do not use QMK features.
I had a much easier time getting QMK project to work on the keyboard than the web stuff pointed to by the seller.
There was a problem hiding this comment.
I'm still working on the documentation, but generally we've been trying to keep boards that have different manufacturers separate (see the recent ergodox split), even if they have the same pinout and everything. The layout stuff helps to let these keyboards still use the same keymaps though ;)
|
With #1784 (hopefully be able to merge it this week), we'll be able to structure projects in folders like |
|
I think the restructuring is unneeded now, but it looks like there are some other changes here that would be nice to have - are you interested in rebasing things? |
|
Will look into it in the coming days. |
|
Yes, I am interested.
Blake
On Nov 1, 2017 10:23 AM, "Jack Humbert" <notifications@github.com> wrote:
I think the restructuring is unneeded now, but it looks like there are some
other changes here that would be nice to have - are you interested in
rebasing things?
—
You are receiving this because you commented.
Reply to this email directly, view it on GitHub
<#1825 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/Acm8w12wHBMGdSy3cScE0CX7ZjfGxg1cks5syI0KgaJpZM4P0jbs>
.
|
# Conflicts: # Makefile # keyboards/converter/usb_usb/README.md # keyboards/converter/usb_usb/rules.mk
Also attempt to get the BLE thing more properly integrated. Also also fix led_set() to call led_set_kb().
|
Awesome! Thanks :) |
* restructure converters each converter is its own keyboard and different hardware variants are different subprojects. remove (seemingly) old method of loading layouts from main Makefile * call led_set_kb() from overridden led_set() * put converter back into one folder * revert some structure changes to bring in line with qmk#1784. Also attempt to get the BLE thing more properly integrated. Also also fix led_set() to call led_set_kb().
* 'master' of git://github.com/qmk/qmk_firmware: (291 commits) More "oscillope" keymap fixes. (qmk#1982) Improved README of yuuki and added RGB commands (qmk#1983) restructure converters (qmk#1825) qwerty_code_friendly: configurable left thumb Migrated most code from keymaps to userspace (qmk#1980) Small ergodox config fix and update. Update and move around drashna keymaps (qmk#1976) make it easy to customize logo image add pgm_read_dword for Infinity ErgoDox 333fred layout update (qmk#1971) Pete's 40th XD64 Layout Ergodox EZ and Atreus 42 key dvorak layout updates (qmk#1964) Correct the rules.mk documentation for auto shift. Fix RGBLIGHT startup color (qmk#1975) adds indication up to layer 7 restore default mode/color if no 0 color adds per-layer rgb color option to ez update gh60 info add gh60 info.json several improvements for mitosis:datagrok (qmk#1960) ...
* restructure converters each converter is its own keyboard and different hardware variants are different subprojects. remove (seemingly) old method of loading layouts from main Makefile * call led_set_kb() from overridden led_set() * put converter back into one folder * revert some structure changes to bring in line with qmk#1784. Also attempt to get the BLE thing more properly integrated. Also also fix led_set() to call led_set_kb().
each converter is its own keyboard and different hardware variants are different subprojects.
remove (seemingly) old method of loading layouts from main Makefile